types: fix various use of volatile in type registration

The use of volatile was incorrect in GLib and has been that way for
a long time. Recently however that has changed, and this makes GTK
follow suit to avoid using volatile in the type registration.

See also: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719

Combined with the above merge request for GLib, this fixes a large
number of compilation warnings when using Clang.

diff --git a/gdk/gdkenumtypes.c.template b/gdk/gdkenumtypes.c.template
index c5104e0e0d8692ea6ddd4861657738c7e8ac211e..768210a839eb74e8bd8e6c5b2187c67025e83b19 100644 (file)
--- a/gdk/gdkenumtypes.c.template
+++ b/gdk/gdkenumtypes.c.template
@@ -12,7 +12,7 @@
 GType
 @enum_name@_get_type (void)
 {
-  static volatile gsize g_define_type_id__volatile = 0;
+  static gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 9cfefd0d398d68b3acccd9c87150daadb65d3fec..100fc7ba9e79c23d5580e481305e926275bbfe1f 100644 (file)
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -210,7 +210,7 @@ gdk_event_init (GdkEvent *self)
 GType
 gdk_event_get_type (void)
 {
-  static volatile gsize event_type__volatile;
+  static gsize event_type__volatile;
 
   if (g_once_init_enter (&event_type__volatile))
     {
@@ -374,7 +374,7 @@ static GType gdk_event_types[GDK_EVENT_LAST];
 GType \
 type_name ## _get_type (void) \
 { \
-  static volatile gsize gdk_define_event_type_id__volatile; \
+  static gsize gdk_define_event_type_id__volatile; \
   if (g_once_init_enter (&gdk_define_event_type_id__volatile)) \
     { \
       GType gdk_define_event_type_id = \
@@ -453,7 +453,7 @@ gdk_event_init_types_once (void)
 void
 gdk_event_init_types (void)
 {
-  static volatile gsize event_types__volatile;
+  static gsize event_types__volatile;
 
   if (g_once_init_enter (&event_types__volatile))
     {

diff --git a/gsk/gskdebug.c b/gsk/gskdebug.c
index 4e197257ef1ae7ecde4f498a604ccbda7f567c73..83a3619fe738bdec81ed4b5a5b400549b41029cf 100644 (file)
--- a/gsk/gskdebug.c
+++ b/gsk/gskdebug.c
@@ -22,7 +22,7 @@ static guint gsk_debug_flags;
 static void
 init_debug_flags (void)
 {
-  static volatile gsize gsk_debug_flags__set;
+  static gsize gsk_debug_flags__set;
 
   if (g_once_init_enter (&gsk_debug_flags__set))
     {

diff --git a/gsk/gskenumtypes.c.template b/gsk/gskenumtypes.c.template
index 5aa13fe70e4399984ac282745178cefbdfbac22d..ae1d0de501927f59338e3ab1c9faf2920b1bbff5 100644 (file)
--- a/gsk/gskenumtypes.c.template
+++ b/gsk/gskenumtypes.c.template
@@ -13,7 +13,7 @@
 GType
 @enum_name@_get_type (void)
 {
-  static volatile gsize g_define_type_id__volatile = 0;
+  static gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {

diff --git a/gsk/gskrendernode.c b/gsk/gskrendernode.c
index 92dfc77e2f13f5cb36e050db04526b78faaddaaa..f0980ba369a113f74c62b8dccfe4058d9a4dacd3 100644 (file)
--- a/gsk/gskrendernode.c
+++ b/gsk/gskrendernode.c
@@ -184,7 +184,7 @@ gsk_render_node_init (GskRenderNode *self)
 GType
 gsk_render_node_get_type (void)
 {
-  static volatile gsize render_node_type__volatile;
+  static gsize render_node_type__volatile;
 
   if (g_once_init_enter (&render_node_type__volatile))
     {

diff --git a/gsk/gskrendernodeimpl.c b/gsk/gskrendernodeimpl.c
index e5228d88c9fd2c575c705a9d163e23d47e933b32..da3c130110e9e718d405d4fb8643125b4419bea8 100644 (file)
--- a/gsk/gskrendernodeimpl.c
+++ b/gsk/gskrendernodeimpl.c
@@ -5165,7 +5165,7 @@ gsk_render_node_init_types_once (void)
 void
 gsk_render_node_init_types (void)
 {
-  static volatile gsize register_types__volatile;
+  static gsize register_types__volatile;
 
   if (g_once_init_enter (&register_types__volatile))
     {

diff --git a/gtk/css/gtkcssenumtypes.c.template b/gtk/css/gtkcssenumtypes.c.template
index 063b8d0d3f384aa70e6a915e09968133ec53d592..cb4c9ac217da9290f0cd716cd2ce7ed020dc272f 100644 (file)
--- a/gtk/css/gtkcssenumtypes.c.template
+++ b/gtk/css/gtkcssenumtypes.c.template
@@ -13,7 +13,7 @@
 GType
 @enum_name@_get_type (void)
 {
-  static volatile gsize g_define_type_id__volatile = 0;
+  static gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {

diff --git a/gtk/gtkexpression.c b/gtk/gtkexpression.c
index 0974face668739f36d5c99c72d6fca0d7044527e..b08c8bf80f26ad6f1a8e3b61559bc81144a14d8c 100644 (file)
--- a/gtk/gtkexpression.c
+++ b/gtk/gtkexpression.c
@@ -249,7 +249,7 @@ struct _GtkExpressionWatch
 GType \
 type_name ## _get_type (void) \
 { \
-  static volatile gsize gtk_define_expression_type_id__volatile; \
+  static gsize gtk_define_expression_type_id__volatile; \
   if (g_once_init_enter (&gtk_define_expression_type_id__volatile)) \
     { \
       GType gtk_define_expression_type_id = \
@@ -490,7 +490,7 @@ param_expression_values_cmp (GParamSpec   *pspec,
 GType
 gtk_param_expression_get_type (void)
 {
-  static volatile gsize param_expression_type__volatile;
+  static gsize param_expression_type__volatile;
 
   if (g_once_init_enter (&param_expression_type__volatile))
     {
@@ -598,7 +598,7 @@ gtk_expression_init (GtkExpression *self)
 GType
 gtk_expression_get_type (void)
 {
-  static volatile gsize expression_type__volatile;
+  static gsize expression_type__volatile;
 
   if (g_once_init_enter (&expression_type__volatile))
     {

diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c
index 00f1a6c381b25dd0d5fc918c3dc153a4caf47444..13937ad9bd54b78b88c227010581512d89c7dbb2 100644 (file)
--- a/gtk/gtkprintoperation-win32.c
+++ b/gtk/gtkprintoperation-win32.c
@@ -1713,7 +1713,7 @@ gtk_print_operation_run_with_dialog (GtkPrintOperation *op,
   GtkPrintOperationPrivate *priv;
   IPrintDialogCallback *callback;
   HPROPSHEETPAGE prop_page;
-  static volatile gsize common_controls_initialized = 0;
+  static gsize common_controls_initialized = 0;
 
   if (g_once_init_enter (&common_controls_initialized))
     {

diff --git a/gtk/gtkprivatetypebuiltins.c.template b/gtk/gtkprivatetypebuiltins.c.template
index d7961be8ef05439832e8a9a855c6934521caf6df..031ffb802009d281e4b975af65c27332dd35ff12 100644 (file)
--- a/gtk/gtkprivatetypebuiltins.c.template
+++ b/gtk/gtkprivatetypebuiltins.c.template
@@ -14,7 +14,7 @@
 GType
 _@enum_name@_get_type (void)
 {
-  static volatile gsize g_define_type_id__volatile = 0;
+  static gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {

diff --git a/gtk/gtktypebuiltins.c.template b/gtk/gtktypebuiltins.c.template
index 9a5a360f0961b59966a3b7de20208f43ca443eb4..844e546b3ddae50d7768365c3c90f13dc5092ffb 100644 (file)
--- a/gtk/gtktypebuiltins.c.template
+++ b/gtk/gtktypebuiltins.c.template
@@ -13,7 +13,7 @@
 GType
 @enum_name@_get_type (void)
 {
-  static volatile gsize g_define_type_id__volatile = 0;
+  static gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {